bitkeeper revision 1.1159.168.2 (4195d5cd7EdTdzGQTt_b3E_j7MPmUw)
authorcl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Sat, 13 Nov 2004 09:37:17 +0000 (09:37 +0000)
committercl349@freefall.cl.cam.ac.uk <cl349@freefall.cl.cam.ac.uk>
Sat, 13 Nov 2004 09:37:17 +0000 (09:37 +0000)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xen-2.0-testing.bk
into freefall.cl.cam.ac.uk:/local/scratch/cl349/xen-2.0-testing.bk


Trivial merge